update manifest
update manifest
general cleanup
cleanup
add support jar
clean up
Merge pull request #1 from aporter/master

update from parent repo