Merge pull request #11 from hazendaz/master

Various Updates