Closes issue #7 and code is also now cleaned up a little.
Merge pull request #8 from taai/master

Closes issue #7 and code is also now cleaned up a little.