closes #28
closes #19
Merge branch 'master' of https://github.com/nthitz/pluggedN