merged work from sunday afternoon
Merge pull request #1 from nekocoder/master

merged work from sunday afternoon