Merge pull request #14 from luckyhacky/master