Merge pull request #1 from roybaer/master

c++ification and extension to two markers
view classes