Merge pull request #15 from lukasz91/master

Merge Master - Dev