Merge pull request #3 from sosandstrom/master

Update to the latest
Merge pull request #8 from goldengekko/master

Merge pull request #3 from sosandstrom/master