merge
Merge pull request #57 from palaa159/develop

quick fixes