Closes issue #6

@johnnyfreeman
Closes issue #6