Merge pull request #11 from vorou/master

VS2013 update