Merge with github
Moved bypshttpasf to java/