Merge pull request #39 from lefta/master

Enhancements closing bug reports