Merge pull request #39 from dozylynx/master