Merge pull request #1 from lostplesed/master

1233