Merge pull request #45 from mLuby/dev

Merges from Jake's PR.