Merge pull request #5 from haxmb/master

Bringing everything up to date