Code

updated for 1.2 release -- alex