Merge pull request #100 from Contegix/master

Fixed Issue 98