Merge branch 'develop'
Merge pull request #5 from speedland/develop

Update master
Merge branch 'develop' of https://github.com/speedland/speedland
Merge branch 'develop' of https://github.com/speedland/speedland
Merge branch 'master' of https://github.com/speedland/speedland