Version v1.2.0
Fixed issue 23. added a version number
Merge branch 'dev'