Fixed Issue #41

Fixed http://git.io/QxUrZA