Issue #108 solved
Merge pull request #109 from Phyks/dev

Issue #108 solved