Merge pull request #308 from hintjens/master

Fixed issue #307
Merge pull request #309 from hintjens/master

Bumped version on development master to 2.1.0
Merge pull request #310 from hintjens/master

Fixed variable string processing
Compile under Windows without warnings.

Signed-off-by: Shannen Saez <shannenlaptop@gmail.com>
Merge pull request #311 from shancat/master

Compile under Windows without warnings.
Allow classes to be private, with header file in src directory