fix #6
added author
merged
merged