pull request

finally merging the repos; hope this will help to glue the two repos better together.