commit to my brunch
Merge pull request #2 from rokvintar/dev-rok

merged with dev-rok