Merge Issue8 into master