Merge pull request #2 from Butsco/master

Small improvements