apdates 12-4-13

Signed-off-by: Martin Nguyen <martin.nguyen@live.com>
Merge branch 'master' of https://github.com/mwin007/modever