Closes #87
Merge branch 'dev' of https://github.com/djrieger/mjplusplus into dev