Merge pull request #165 from drywall/pure-develop

Punchlist items for WCIJ
Merge pull request #166 from drywall/pure-develop

Bugfixes
Killing undefined variable notices