fix #18
Merge branch 'master' of https://github.com/Gisto/gisto