Merge pull request #3 from CodeBlanche/master

Bug fixes