Merge pull request #29 from BlueMax/master