Merge pull request #44 from aipp/master

Final touches before the 0.5 release