Merge pull request #7 from wagnert/master

diff reviewed
Merge branch 'techdivision'