Merge pull request #13 from Jackiebo/master