Another test commit
Merge pull request #6 from almost/master

Merge from master