Merge pull request #51 from DanielO/master