Removed Subnum and added bug fixes
Merge pull request #37 from drberry85/master

Removed Subnum and added bug fixes