Fixed #96. http://stackoverflow.com/a/26002326/1698467
Merge branch 'fix-96'