Merge pull request #134 from pepelsbey/master

Number of fixes and new feature. Fixes #126