Merge pull request #35 from aleibl/develop

Some cleanup plus packaging enhancements.