Fixed bus error
Merge branch 'master' of https://github.com/aishnogah/tripoli