Getting ready to tag as version 0.1.6