Working on #37 and other small fixes
Merge pull request #39 from anryko/master

Working on #37 and other small fixes