VS2013 compatible. Closes #3