updated for development on 0.8.0-SNAPSHOT