Merge pull request #17 from IanJRigg/master

pulling chris' changes
source1 is back
Merge pull request #75 from Ricky1833/master

source1