fix #3
fix #9
Merge branch 'master' of https://github.com/libis/Libisnet-Omeka.git