nutterb Merge pull request #119 from nutterb/devel