Closes #1
Merge branch 'dev'