added ./bin to path
merged master