closes #58
Merge branch 'develop' of https://github.com/nfms4redd/nfms into develop