Merge pull request #230 from Lorquas/master

test pull request