hitman401 Merge pull request #43 from ustulation/master