Merged develop branch to include travis label, v0.2.1