Merge pull request #6 from CodeBlanche/master

Additional bug fixes
More bug fixes