Merge pull request #17 from UMD-ARLIS/dev

Minor fixes for 0.0.6 release