Merge pull request #14 from cordoval/master

Improvements
further cleanup
fix markdown