Merge pull request #55 from cbranch/c8b54faba514c0472b74ae0abbb7b3adc3a4e6e2