Merge pull request #7 from CodeBlanche/master

More bug fixes