Merge pull request #109 from mshamash/master

Bug fixes + improvements
Avoiding merge conflicts.
Merge pull request #7 from stephandev/master

Avoiding merge conflicts