Merge pull request #3 from johan-jonsson-mobenga/master

Some refactoring
Cleaned up the code a bit...
Updated readme.