Merge pull request #34 from axxonyara/master

Boatload of bug fixes
Merge pull request #1 from GoEverywhere/master

Merge pull request #34 from axxonyara/master