misc updates
Merge pull request #2 from kwaledesign/dev

misc updates