Merge pull request #2 from McF1st/master

Get latest
Merge pull request #4 from toftan/master

Merge pull request #2 from McF1st/master