Merge pull request #13 from jimmyye/master