Merge pull request #25 from chawkinsuf/master

Small improvements