#1 and #3 Fixed

This fixes #1 and resolves #3.