Fix all errors and bugs, improve code quality
Merge pull request #3 from R3creat3/master

Fix all errors and bugs, improve code quality