First check, compared with java
Merge pull request #1 from peterstevens130561/master

This looks great, @peterstevens130561 !