Merge pull request #5 from haxmb/master

Bringing everything up to date
Merge pull request #6 from haxmb/review

Merge pull request #5 from haxmb/master