Merge pull request #1 from igutekunst/master

Lots of changes
Merge branch 'dev' of github.com:igutekunst/rum