Merge pull request #69 from lu-yang/develop

Issues 87 & 88
Merge remote-tracking branch 'robworth/develop' into develop