Merge fix #3

Read to merge fix #3 into master branch