Merge pull request #2 from forthommel/master

Merging of ccall-jetset with base