Basic feature complete
Code Optimization
Updated changelog
Updated Readme
Merge branch 'temp'