tracking develop forward to current status
Merge pull request #1 from mammothbane/develop

track master forward