Fixed: issue #2

Fixed: #1 and #2