Commit of all current work.
Merge pull request #1 from Surak256/master

Commit of all current work.