0.17
Merge pull request #16 from JohnAdam/master

0.17