Address #171
Merge branch 'dev'