Merge pull request #9 from bheart/master

Bring rustecs up to date with c4a3be6b & 221edbae