bugfix release
bugfix with additional data
Merge branch 'master' of file:///Volumes/devel/git/morphium
Merge branch 'master' of https://github.com/sboesebeck/morphium