made conic approx possible and fixed some bugs
bug fixes to get examples to work
added new example for foxsi x-ray alignment
merge from upstream
Merge pull request #11 from ehsteve/master

Updates