Merge pull request #15 from adamreis/samara

fixed null pointer & merged new code from master
Pipers now only look in their section
Added lots of 9s to the two piper speeds