Completes issues #3 and implements issue #11