Bumping the master branch to current develop branch #19

Closed greatfireball closed 7 years ago