a couple of fixes for farscape
tests for new methods
Merge pull request #13 from mdsol/feature/fixes

a couple of fixes for farscape