issue #89 + tests
Merge pull request #96 from georgebyelas/master

issue #89 + tests