Merge pull request #306 from weese/hotfix/snp-store

[FIX] fixed ambiguous function problem in VS2013
[FIX] removed VS12 ambigous bug
Merge pull request #309 from weese/hotfix/fix-vs12

[FIX] removed VS12 ambigous bug (develop)