updated makefile
fixed gcc compilation errors
replaced own implementation of boost::variant with boost::variant