Merge pull request #4 from PuckCh/master

Small improvements