Revert "Fix for Issue #13"

This reverts commit 43c7c76ec4575852307bbd0cc7667ea5d1fdd43d.