Merge pull request #1 from hleaps/master

thismerge