Merge pull request #44 from aprooks/master