Fixed #42
Merge branch 'master' into newtitle