Merge branch 'techdivision'
Merge pull request #5 from wagnert/master

Merge branch 'techdivision'