fix #12
fix #13
fix #11
Merge branch 'master' of https://github.com/libis/Libisnet-Omeka.git