Merge pull request nrc-cnrc#33 from nrc-cnrc/develop

Merging develop branch into master

Merge pull request nrc-cnrc#12 from nrc-cnrc/develop

Merging develop branch into master