Implemented custom markers so that they are chosen according to type. fixes #3