Merge issue13 into master