20131220 oba#
Merge pull request #2 from MedibaWorkshop/feature/issue-010

20131220 oba