Improved Composer JSON
Cleanup code
Merge pull request #11 from sergeyklay/next

Minor fixes & improvements