Small improvements
Merge pull request #2 from coduo/additions

Small improvements