Merge pull request #5 from tonipenya/master

removed unnecessary code.
White-space cleanup
Removed unused imports
Merge remote-tracking branch 'marc/master'
getMessage is now in Factor