Version 0.1.5 - see changeLog
Merge branch 'master' into dev