Merge pull request #15 from confpub/master

MSR 2013 added
Merge remote-tracking branch 'upstream/master'