ianopolous correctness fixes
Latest commit 01debb3 Dec 12, 2015