Ekimik/workity2 — pull request #5 by Ekimik (2014-06-25 16:22:10+00:00)
Title: Dev

Merge new and refactored functionalities with master branch