Fix #103
Merge branch 'master' of https://github.com/ajaxplorer/ajaxplorer-core