* Added more type safety
Merge branch 'master' of https://github.com/jkiddo/jolivia