Merge pull request #1 from hleaps/master

thismerge
Merge pull request #2 from hleaps/testsecond

Merge pull request #1 from hleaps/master