Moved some functionality in separate methods
Updated helper methods
Merge branch 'master' of github.com:almende/eve
version numbering and changelogs updated