Merge pull request #12 from iltar/master

Fix for #11