Merge pull request #1 from thomstel/master

Trying to get current
Testing the push!
More fake stuff
Merge pull request #3 from jblose/master

a