Updated for 0.11.13
Merge pull request #135 from kkoopa/develop

Updated for 0.11.13