Merge pull request #5 from McF1st/master

Get latest
Merge pull request #9 from toftan/master

Merge pull request #5 from McF1st/master