Merge pull request #22 from nichmack/master

Fix the fixing
Merge pull request #23 from lucashaley/master

get the updates