Fixed #12
merged changes