More reliable implementation
Merge branch 'master' of https://github.com/earvc/softmow_main