fix non inline conditions and cleanup readme
Merge pull request #1 from tchak/master

Fix non inline conditions and cleanup Readme