Merge pull request #1 from chrisvdp/master

Master