Merge pull request #1 from dpuelz/master

Long Long
committ to forked testbranch

testtest
Merge remote-tracking branch 'origin/TestBranch'
Merge pull request #4 from mathsoul/master

pull 2