Merging - fingers crossed
Merge branch 'develop' of https://github.com/shibuya246/MYFX.WPF2013 into develop