testfixes
Merge pull request #62 from aenario/master

testfixes