Merge pull request #12 from MrBean83/master

Merge pull request #11 from MrBean83/fix_this
Merge pull request #15 from MrBean83/fix_this

Merge pull request #12 from MrBean83/master