improved test coverage (close #5)
update to 20140909