JCaporuscio Merge pull request #37 from dadulak/issue-750