added helper text
updated test package to use nose
merged dev into master