Fixed style issues - fix#16
Merge branch 'dev' of github.com:blazeqwest/epsilon into dev

etching latest updates
fix#16