Merge with v1.8, issues #22, #23

I've tested it with VS 2012 and TFS 2010.