Some improvements
Merge pull request #23 from mkatanski/master

Some improvements