Merge pull request #3 from LinMod/master

Remerge Master and Temp
Merge pull request #4 from LinMod/temp

Get one branch going again