Merge pull request #16 from 1169306/master

pull