Merge pull request #14 from yllekkram/mark-master

Mark master