Fix #2 and #22
Merge pull request #53 from SotiriosVrachas/patch-1

Fix #2 and #22