Merge 1.2 changes to ArtsW

Merge 1.2 changes to ArtsW
Merge pull request #12 from kcristiano/artsw

Merge 1.2 changes to ArtsW