Merge pull request #18 from wvanbreukelen/master

Merged the alpha branch with the master branch