pairing with James and Nadav
Merge pull request #1 from tansaku/master

pairing with James and Nadav