Merge pull request #1 from sitle/develop

Major update