Merge pull request #1 from nicklondhe/master

Merging the latest changes