Merge pull request #34 from axxonyara/master

Boatload of bug fixes