Merge pull request #68 from theponti/develop

Develop
Merge pull request #71 from theponti/develop

Develop
Merge pull request #73 from theponti/develop

Develop
Merge pull request #74 from theponti/develop

Develop
Merge pull request #75 from theponti/develop

Develop
Merge pull request #80 from theponti/develop

Develop
Merge pull request #81 from theponti/simplify-styles

Simplify styles
Merge pull request #84 from theponti/develop

Develop
Merge pull request #82 from theponti/master

Merge from master