Updated
Merge pull request #74 from korczis/devel

Updated