fixed a lot of minor issues while working on sample project
Merge branch 'master' of https://github.com/emilsjolander/sprinkles