fixed some minor issues
Merge branch 'master' of https://github.com/squell/ecalogic