Merge pull request #2 from Matzo/develop

Develop
Merge pull request #8 from Matzo/develop

Develop
change deployment target
Merge pull request #21 from Matzo/master

Master