Merge pull request #3 from swirlycheetah/master

updates
Merge pull request #4 from swirlycheetah/develop

Merge pull request #3 from swirlycheetah/master