Merge pull request #49 from nuest/dev

Dev update for release
Merge remote-tracking branch 'upstream/dev' into dev