Closes issue #6

@johnnyfreeman