initial commit
Remove dependence on boost and fix bug