Merge pull request #7 from Ayrx/master

Squashed commit containing a whole lot of stuff.