Fixed issue #6

#6