Added package scope. closes #604