- fixed compilation on linux using boost 1.55
- added fix for windows compilation (already made this change, but I guess
  it got lost in a merge)