latest changes (updating git status)
ideas for functions
updating copyright to 2013
latest changes
latest changes
Merge