Resolved #2, pushing to develop branch.
Merge branch 'develop'