Fixed #23
Fixed #9 in 2a2c65b8a131a48780299a564d5cb0134d10cf88
Merge branch 'master' of https://github.com/chesmuh/museum.git