close #58
beanz meanz this closes #57
Merge pull request #59 from fommil/sundry_fixes

Sundry fixes