Merge changes to dev branch.  (#100)