Improved accuracy
Updated readme
Merged master with dev