Merge pull request #14 from frececroka/master