Fixing issues #11 and #12