Merge pull request #1 from colinfik/master

Hacking
hello
Merge pull request #2 from nhwheele/master

test